I'm currently working through the pages for each of the entities to make them cleaner and more organised. I'm going through every episode and using both my interpretation as well as existing comments on episode pages to categorise statements by entities. If you disagree with my decisions, feel free to message me.